Fix path for the installation of python modules

Last-Update: 2020-11-06

Gbp-Pq: Name 50_fix_python-modules_path.patch

diff --git a/CMake/vtkModuleWrapPython.cmake b/CMake/vtkModuleWrapPython.cmake
index b0707df601c510795785f84530918083a0b88efd..865c75c59091eab738f98a370de7cbd318d00e5e 100644 (file)
--- a/CMake/vtkModuleWrapPython.cmake
+++ b/CMake/vtkModuleWrapPython.cmake
@@ -82,7 +82,7 @@ function (vtk_module_python_default_destination var)
         "for Python modules.")
       set(_vtk_python_version_suffix)
     endif ()
-    set(destination "${CMAKE_INSTALL_LIBDIR}/python${_vtk_python_version_suffix}/site-packages")
+    set(destination "lib/python3/dist-packages")
   endif ()
 
   set("${var}" "${destination}" PARENT_SCOPE)

diff --git a/Utilities/Python/CMakeLists.txt b/Utilities/Python/CMakeLists.txt
index f7ae2a77b4e5db31e6560869b20527bdb2c2662c..96bf7bd989dafc7c6c500f18692388fd162b573f 100644 (file)
--- a/Utilities/Python/CMakeLists.txt
+++ b/Utilities/Python/CMakeLists.txt
@@ -54,7 +54,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX)
     set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages")
   else ()
     set(VTK_PYTHON_SITE_PACKAGES_SUFFIX
-      "python${vtk_python_version_pair}/site-packages")
+      "python3/dist-packages")
   endif ()
 endif ()
 

diff --git a/Wrapping/Python/vtkmodules/__init__.py.in b/Wrapping/Python/vtkmodules/__init__.py.in
index 3730dc01af17630dae090eeeff56c7502f140c52..7fbcb93d93128fc580da24cf98f4a5a0883c1215 100644 (file)
--- a/Wrapping/Python/vtkmodules/__init__.py.in
+++ b/Wrapping/Python/vtkmodules/__init__.py.in
@@ -8,21 +8,20 @@ import importlib.util
 from pathlib import Path
 
 from importlib.abc import MetaPathFinder
-from importlib.machinery import ExtensionFileLoader
+from importlib.machinery import ExtensionFileLoader, EXTENSION_SUFFIXES
 
 LOADING_STACK = []
-LIB_EXTS = [".pyd", ".so"]
+
 
 def find_lib_path(paths, vtk_module_name):
-    for ext in LIB_EXTS:
+    for ext in EXTENSION_SUFFIXES:
         for base_path in paths:
             # vtk-wheel => vtkCommonCore.cpython-310-darwin.so
             # paraview  => vtkCommonCore.so
             # Caution: vtkIOXML vs vtkIOXMLParser
-            for f in Path(base_path).glob(f"{vtk_module_name}[.-]*"):
-                resolved_file = f.resolve()
-                if resolved_file.is_file() and ext in resolved_file.suffixes:
-                    return str(resolved_file)
+            f = Path(base_path) / f"{vtk_module_name}{ext}"
+            if f.is_file():
+                return str(f.resolve())
 
 
 class VTKMetaHook(MetaPathFinder):